Rename gtkprinter-private.h

Name this header gtkprinterprivate.h, following
our convention for private headers.

diff --git a/docs/reference/gtk/meson.build b/docs/reference/gtk/meson.build
index 609cf28faf8c004dce133edf36691a2bd33917c3..35b606fd74cf7f2f30288e81b6e22d8fbf75d961 100644 (file)
--- a/docs/reference/gtk/meson.build
+++ b/docs/reference/gtk/meson.build
@@ -141,7 +141,7 @@ private_headers = [
   'gtkplacesviewrowprivate.h',
   'gtkpointerfocusprivate.h',
   'gtkpopoverprivate.h',
-  'gtkprinter-private.h',
+  'gtkprinterprivate.h',
   'gtkprintoperation-private.h',
   'gtkprivate.h',
   'gtkprogresstrackerprivate.h',

diff --git a/gtk/gtkprinter-private.h b/gtk/gtkprinter-private.h
deleted file mode 100644 (file)
index 51ec1a8..0000000
--- a/gtk/gtkprinter-private.h
+++ /dev/null
@@ -1,54 +0,0 @@
-/* GTK - The GIMP Toolkit
- * gtkprintoperation.h: Print Operation
- * Copyright (C) 2006, Red Hat, Inc.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library. If not, see <http://www.gnu.org/licenses/>.
- */
-
-#ifndef __GTK_PRINTER_PRIVATE_H__
-#define __GTK_PRINTER_PRIVATE_H__
-
-#include <gtk/gtk.h>
-#include <gtk/gtkunixprint.h>
-#include "gtkprinteroptionset.h"
-
-G_BEGIN_DECLS
-
-GtkPrinterOptionSet *_gtk_printer_get_options               (GtkPrinter          *printer,
-                                                            GtkPrintSettings    *settings,
-                                                            GtkPageSetup        *page_setup,
-                                                            GtkPrintCapabilities capabilities);
-gboolean             _gtk_printer_mark_conflicts            (GtkPrinter          *printer,
-                                                            GtkPrinterOptionSet *options);
-void                 _gtk_printer_get_settings_from_options (GtkPrinter          *printer,
-                                                            GtkPrinterOptionSet *options,
-                                                            GtkPrintSettings    *settings);
-void                 _gtk_printer_prepare_for_print         (GtkPrinter          *printer,
-                                                            GtkPrintJob         *print_job,
-                                                            GtkPrintSettings    *settings,
-                                                            GtkPageSetup        *page_setup);
-cairo_surface_t *    _gtk_printer_create_cairo_surface      (GtkPrinter          *printer,
-                                                            GtkPrintSettings    *settings,
-                                                            gdouble              width,
-                                                            gdouble              height,
-                                                            GIOChannel          *cache_io);
-GHashTable *         _gtk_printer_get_custom_widgets        (GtkPrinter          *printer);
-
-/* GtkPrintJob private methods: */
-GDK_AVAILABLE_IN_ALL
-void gtk_print_job_set_status (GtkPrintJob   *job,
-                              GtkPrintStatus status);
-
-G_END_DECLS
-#endif /* __GTK_PRINT_OPERATION_PRIVATE_H__ */

diff --git a/gtk/gtkprinter.c b/gtk/gtkprinter.c
index d9ce1efaddbfb37ffd6a80789cc119abb4e7cd2c..b3ee28fc36341e828b8d8ab92bfffcd3f996929f 100644 (file)
--- a/gtk/gtkprinter.c
+++ b/gtk/gtkprinter.c
@@ -24,7 +24,7 @@
 #include "gtkprivate.h"
 
 #include "gtkprinter.h"
-#include "gtkprinter-private.h"
+#include "gtkprinterprivate.h"
 #include "gtkprintbackend.h"
 #include "gtkprintjob.h"
 

diff --git a/gtk/gtkprinterprivate.h b/gtk/gtkprinterprivate.h
new file mode 100644 (file)
index 0000000..51ec1a8
--- /dev/null
+++ b/gtk/gtkprinterprivate.h
@@ -0,0 +1,54 @@
+/* GTK - The GIMP Toolkit
+ * gtkprintoperation.h: Print Operation
+ * Copyright (C) 2006, Red Hat, Inc.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef __GTK_PRINTER_PRIVATE_H__
+#define __GTK_PRINTER_PRIVATE_H__
+
+#include <gtk/gtk.h>
+#include <gtk/gtkunixprint.h>
+#include "gtkprinteroptionset.h"
+
+G_BEGIN_DECLS
+
+GtkPrinterOptionSet *_gtk_printer_get_options               (GtkPrinter          *printer,
+                                                            GtkPrintSettings    *settings,
+                                                            GtkPageSetup        *page_setup,
+                                                            GtkPrintCapabilities capabilities);
+gboolean             _gtk_printer_mark_conflicts            (GtkPrinter          *printer,
+                                                            GtkPrinterOptionSet *options);
+void                 _gtk_printer_get_settings_from_options (GtkPrinter          *printer,
+                                                            GtkPrinterOptionSet *options,
+                                                            GtkPrintSettings    *settings);
+void                 _gtk_printer_prepare_for_print         (GtkPrinter          *printer,
+                                                            GtkPrintJob         *print_job,
+                                                            GtkPrintSettings    *settings,
+                                                            GtkPageSetup        *page_setup);
+cairo_surface_t *    _gtk_printer_create_cairo_surface      (GtkPrinter          *printer,
+                                                            GtkPrintSettings    *settings,
+                                                            gdouble              width,
+                                                            gdouble              height,
+                                                            GIOChannel          *cache_io);
+GHashTable *         _gtk_printer_get_custom_widgets        (GtkPrinter          *printer);
+
+/* GtkPrintJob private methods: */
+GDK_AVAILABLE_IN_ALL
+void gtk_print_job_set_status (GtkPrintJob   *job,
+                              GtkPrintStatus status);
+
+G_END_DECLS
+#endif /* __GTK_PRINT_OPERATION_PRIVATE_H__ */

diff --git a/gtk/gtkprintjob.c b/gtk/gtkprintjob.c
index e8e1c7c3b50b23d109ac93fb7ace5949db36f84d..89c9038501a4b2a5a1c829e4c59d9c2d22899f4b 100644 (file)
--- a/gtk/gtkprintjob.c
+++ b/gtk/gtkprintjob.c
@@ -49,7 +49,7 @@
 
 #include "gtkprintjob.h"
 #include "gtkprinter.h"
-#include "gtkprinter-private.h"
+#include "gtkprinterprivate.h"
 #include "gtkprintbackend.h"
 
 #ifndef O_BINARY

diff --git a/gtk/gtkprintunixdialog.c b/gtk/gtkprintunixdialog.c
index 6ef2682c3a8caca61bfdf9821c1c64ae28c9e58d..440c9555d418b7008ef81af29d9c40ec68f1ea94 100644 (file)
--- a/gtk/gtkprintunixdialog.c
+++ b/gtk/gtkprintunixdialog.c
@@ -29,7 +29,7 @@
 
 #include "gtkcustompaperunixdialog.h"
 #include "gtkprintbackend.h"
-#include "gtkprinter-private.h"
+#include "gtkprinterprivate.h"
 #include "gtkprinteroptionwidget.h"
 #include "gtkprintutils.h"
 

diff --git a/modules/printbackends/gtkprintbackendcloudprint.c b/modules/printbackends/gtkprintbackendcloudprint.c
index b5560343a2c1b0ddae6e92e844b904f9b054cf25..964fc750457db78ecc84459a834d1db3998475cb 100644 (file)
--- a/modules/printbackends/gtkprintbackendcloudprint.c
+++ b/modules/printbackends/gtkprintbackendcloudprint.c
@@ -34,7 +34,7 @@
 
 #include <gtk/gtkprintbackend.h>
 #include <gtk/gtkunixprint.h>
-#include <gtk/gtkprinter-private.h>
+#include <gtk/gtkprinterprivate.h>
 
 #include "gtkprintbackendcloudprint.h"
 #include "gtkcloudprintaccount.h"

diff --git a/modules/printbackends/gtkprintbackendcups.c b/modules/printbackends/gtkprintbackendcups.c
index 68396c46c948c9c53e8c0cc08a6149d620997972..739318821aab36a79ace77ab97e22c8aa1e9eafe 100644 (file)
--- a/modules/printbackends/gtkprintbackendcups.c
+++ b/modules/printbackends/gtkprintbackendcups.c
@@ -47,7 +47,7 @@
 #include <gtk/gtk.h>
 #include <gtk/gtkprintbackend.h>
 #include <gtk/gtkunixprint.h>
-#include <gtk/gtkprinter-private.h>
+#include <gtk/gtkprinterprivate.h>
 
 #include "gtkprintbackendcups.h"
 #include "gtkprintercups.h"

diff --git a/modules/printbackends/gtkprintbackendfile.c b/modules/printbackends/gtkprintbackendfile.c
index 64380de750ab7f3f63ab175602e8af7b48d352ec..3f0b18c252a8abde81e3ebd25d06f5dcebd29ecf 100644 (file)
--- a/modules/printbackends/gtkprintbackendfile.c
+++ b/modules/printbackends/gtkprintbackendfile.c
@@ -35,7 +35,7 @@
 #include <glib/gi18n-lib.h>
 
 #include "gtk/gtk.h"
-#include "gtk/gtkprinter-private.h"
+#include "gtk/gtkprinterprivate.h"
 
 #include "gtkprintbackendfile.h"
 

diff --git a/modules/printbackends/gtkprintbackendlpr.c b/modules/printbackends/gtkprintbackendlpr.c
index aefa921515a4947bea9650ae41ea0d7bdfb81924..cef1501c3006294a10e7188cd820de15c5888029 100644 (file)
--- a/modules/printbackends/gtkprintbackendlpr.c
+++ b/modules/printbackends/gtkprintbackendlpr.c
@@ -32,7 +32,7 @@
 #include <glib/gi18n-lib.h>
 
 #include <gtk/gtk.h>
-#include "gtkprinter-private.h"
+#include "gtkprinterprivate.h"
 
 #include "gtkprintbackendlpr.h"
 

diff --git a/modules/printbackends/gtkprintercloudprint.h b/modules/printbackends/gtkprintercloudprint.h
index 564fb150be8adcba101f77e829a8b205316ce5eb..9443039e278acc05d1265ba7848bbcfb3bb2d080 100644 (file)
--- a/modules/printbackends/gtkprintercloudprint.h
+++ b/modules/printbackends/gtkprintercloudprint.h
@@ -20,7 +20,7 @@
 #define __GTK_PRINTER_CLOUDPRINT_H__
 
 #include <glib-object.h>
-#include <gtk/gtkprinter-private.h>
+#include <gtk/gtkprinterprivate.h>
 
 #include "gtkcloudprintaccount.h"
 

diff --git a/modules/printbackends/gtkprintercups.h b/modules/printbackends/gtkprintercups.h
index d51306a4da23c8f430407307d27d3011a71c35a0..7517e4b99fd6c0f9399cd2db5041b89bebf46977 100644 (file)
--- a/modules/printbackends/gtkprintercups.h
+++ b/modules/printbackends/gtkprintercups.h
@@ -24,7 +24,7 @@
 #include "gtkcupsutils.h"
 
 #include <gtk/gtkunixprint.h>
-#include <gtk/gtkprinter-private.h>
+#include <gtk/gtkprinterprivate.h>
 
 #ifdef HAVE_COLORD
 #include <colord.h>